AC_SUBST(C_SWITCH_X_SITE)
AC_SUBST(CFLAGS)
-dnl This is hopefully a temporary hack. In autoconf version 1.3,
-dnl the second argument to AC_DEFINE is quoted in every which way,
-dnl so (as far as I can tell) there's no way to compute the value
-dnl the CPP macro should receive. We cripple that quoting for a
-dnl bit, invoke AC_DEFINE, and then uncripple it.
-
-pushdef([AC_DEFINE_SEDQUOTE],[$1])
-AC_DEFINE(config_machfile, "\"${machfile}\"")
-AC_DEFINE(config_opsysfile, "\"${opsysfile}\"")
-popdef([AC_DEFINE_SEDQUOTE])
-
-AC_DEFINE(LD_SWITCH_X_SITE, ${LD_SWITCH_X_SITE})
-AC_DEFINE(C_SWITCH_X_SITE, ${C_SWITCH_X_SITE})
+AC_DEFINE_UNQUOTED(config_machfile, "\"${machfile}\"")
+AC_DEFINE_UNQUOTED(config_opsysfile, "\"${opsysfile}\"")
+AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE, ${LD_SWITCH_X_SITE})
+AC_DEFINE_UNQUOTED(C_SWITCH_X_SITE, ${C_SWITCH_X_SITE})
+
[
if [ "${HAVE_X_WINDOWS}" = "yes" ] ; then
] AC_DEFINE(HAVE_X_WINDOWS) [